$OpenBSD: patch-lib_openbsd-g++_tmake_conf,v 1.2 2003/02/02 16:34:02 sturm Exp $
--- lib/openbsd-g++/tmake.conf.orig	Fri Jan 31 14:25:37 2003
+++ lib/openbsd-g++/tmake.conf	Fri Jan 31 14:36:50 2003
@@ -7,52 +7,50 @@
 TEMPLATE		= app
 CONFIG			= qt warn_on release
 
-TMAKE_CC		= gcc
-TMAKE_CFLAGS		=
+TMAKE_CC		= %%CC%%
+TMAKE_CFLAGS		= -pthread
 TMAKE_CFLAGS_WARN_ON	= -Wall -W
 TMAKE_CFLAGS_WARN_OFF	= -w
-TMAKE_CFLAGS_RELEASE	= -O2
+TMAKE_CFLAGS_RELEASE	= %%CFLAGS%%
 TMAKE_CFLAGS_DEBUG	= -g
 TMAKE_CFLAGS_SHLIB	= -fPIC
 TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
-TMAKE_CXX		= g++
+TMAKE_CXX		= %%CXX%%
 TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
 TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
 TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
+TMAKE_CXXFLAGS_RELEASE	= %%CXXFLAGS%%
 TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
 TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
 TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
 
-TMAKE_INCDIR		=
-TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
-TMAKE_INCDIR_QT		= $(QTDIR)/include
-TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-TMAKE_LINK		= g++
-TMAKE_LINK_SHLIB	= ld
-TMAKE_LINK_SHLIB_CMD	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) \
-			  `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | \
-			  tsort` $(LIBS)
+TMAKE_INCDIR		= %%LOCALBASE%%/include
+TMAKE_LIBDIR		= %%LOCALBASE%%/lib
+TMAKE_INCDIR_X11	= %%X11BASE%%/include
+TMAKE_LIBDIR_X11	= %%X11BASE%%/lib
+TMAKE_INCDIR_QT		= %%MODQT_INCDIR%%
+TMAKE_LIBDIR_QT		= %%MODQT_LIBDIR%%
+TMAKE_INCDIR_OPENGL	= %%X11BASE%%/include
+TMAKE_LIBDIR_OPENGL	= %%X11BASE%%/lib
+
+TMAKE_LINK		= $$TMAKE_CXX
+TMAKE_LINK_SHLIB	= $$TMAKE_CXX
+TMAKE_LINK_SHLIB_CMD	= $$TMAKE_LINK_SHLIB $$TMAKE_LFLAGS_SHLIB $(LFLAGS) -o $(DESTDIR)$(TARGET_x.y) $(OBJECTS) $(OBJMOC) $(LIBS)
 TMAKE_LFLAGS		=
 TMAKE_LFLAGS_RELEASE	=
 TMAKE_LFLAGS_DEBUG	=
-TMAKE_LFLAGS_SHLIB	= -Bshareable
+TMAKE_LFLAGS_SHLIB	= -shared $$TMAKE_CFLAGS_SHLIB
 TMAKE_LFLAGS_SONAME	=
 
 TMAKE_LIBS		=
 TMAKE_LIBS_X11		= -lXext -lX11 -lm
-TMAKE_LIBS_QT		= -lqt
+TMAKE_LIBS_QT		= -pthread -lqt-mt -lpng
 
 TMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
 
-TMAKE_MOC		= $(QTDIR)/bin/moc
-TMAKE_UIC		= $(QTDIR)/bin/uic
+TMAKE_MOC		= %%MODQT_MOC%%
+TMAKE_UIC		= %%LOCALBASE%%/bin/uic
 
 TMAKE_AR		= ar q
 TMAKE_RANLIB		= ranlib
